fix tests for notice_publisher

Author: CaptainOfHacks

infra/sftp/docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - SFTP_PORT=${SFTP_PORT}
     command: ${SFTP_USER}:${SFTP_PASSWORD}:::upload
     ports:
-      - ${SFTP_PORT:-2235}:${SFTP_PORT}
+      - ${SFTP_PORT:-2235}:22
     networks:
       - sftp-net
       - proxy-net

ted_sws/notice_publisher/services/notice_publisher.py

@@ -23,7 +23,6 @@ def publish_notice(notice: Notice, publisher: SFTPPublisherABC = SFTPPublisher()
     remote_notice_path = f"{remote_folder_path}/{notice.ted_id}.zip"
     source_file = tempfile.NamedTemporaryFile()
     source_file.write(package_content)
-
     try:
         publisher.connect()
         if publisher.publish(source_path=pathlib.Path(source_file.name),
@@ -37,7 +36,7 @@ def publish_notice(notice: Notice, publisher: SFTPPublisherABC = SFTPPublisher()
 
 
 def publish_notice_by_id(notice_id: str, notice_repository: NoticeRepositoryABC,
-                         publisher: SFTPPublisherABC, remote_folder_path=None) -> bool:
+                         publisher: SFTPPublisherABC, remote_folder_path=config.SFTP_PATH) -> bool:
     """
         This function publishes the METS manifestation of a Notice, based on notice_id, in Cellar.
     """

tests/e2e/notice_publisher/adapters/test_notice_publisher.py

@@ -27,7 +27,7 @@ def test_sftp_notice_publisher():
     with pytest.raises(Exception):
         sftp_publisher.publish(source_file.name + "invalid", invalid_remote_path)
 
-    with pytest.raises(ValueError):
+    with pytest.raises(Exception):
         sftp_publisher.publish(source_file.name, None)
 
     published = sftp_publisher.publish(source_file.name, remote_path)

tests/e2e/notice_publisher/services/test_notice_publisher.py

@@ -1,10 +1,11 @@
+import pytest
+
 from ted_sws import config
 from ted_sws.core.model.manifestation import METSManifestation, RDFManifestation
-from ted_sws.core.model.notice import NoticeStatus, UnsupportedStatusTransition
+from ted_sws.core.model.notice import NoticeStatus
 from ted_sws.data_manager.adapters.notice_repository import NoticeRepository
-from ted_sws.notice_publisher.services.notice_publisher import publish_single_notice, NoticePublishBuilder
-from ted_sws.notice_publisher.adapters.sftp_notice_publisher import SFTPNoticePublisher
-import pytest
+from ted_sws.notice_publisher.adapters.sftp_notice_publisher import SFTPPublisher
+from ted_sws.notice_publisher.services.notice_publisher import publish_notice_by_id, publish_notice
 
 
 def test_notice_publisher(notice_2016, mongodb_client):
@@ -23,34 +24,25 @@ def test_notice_publisher(notice_2016, mongodb_client):
 
     notice_repository.update(notice)
 
-    with pytest.raises(UnsupportedStatusTransition):
-        publish_single_notice(notice, notice_repository, config.SFTP_HOST, config.SFTP_USER, config.SFTP_PASSWORD)
-
     notice._status = NoticeStatus.ELIGIBLE_FOR_PUBLISHING
 
     notice_repository.update(notice)
+    sftp_publisher = SFTPPublisher()
 
-    published = publish_single_notice(notice_id, notice_repository, config.SFTP_HOST, config.SFTP_USER,
-                                      config.SFTP_PASSWORD)
+    published = publish_notice_by_id(notice_id, notice_repository, publisher=sftp_publisher)
 
     assert published
 
     with pytest.raises(Exception):
         notice._status = NoticeStatus.ELIGIBLE_FOR_PUBLISHING
-        publish_single_notice(notice, notice_repository, config.SFTP_HOST, config.SFTP_USER, config.SFTP_PASSWORD,
-                              remote_path="/invalid_path")
-
-    with pytest.raises(Exception):
-        notice._status = NoticeStatus.ELIGIBLE_FOR_PUBLISHING
-        publish_single_notice("invalid_notice_id", notice_repository, config.SFTP_HOST, config.SFTP_USER,
-                              config.SFTP_PASSWORD)
+        publish_notice(notice, publisher=sftp_publisher,
+                       remote_folder_path="/invalid_path")
 
     with pytest.raises(ValueError):
         notice._status = NoticeStatus.ELIGIBLE_FOR_PUBLISHING
         notice._mets_manifestation = None
-        publish_single_notice(notice, notice_repository, config.SFTP_HOST, config.SFTP_USER, config.SFTP_PASSWORD)
-
-    notice_publisher = SFTPNoticePublisher(config.SFTP_HOST, config.SFTP_USER, config.SFTP_PASSWORD)
-    notice_publisher.connect()
-    publish_builder = NoticePublishBuilder(notice, notice_repository, notice_publisher)
-    notice_publisher.remove(publish_builder.build_remote_path())
+        publish_notice(notice, publisher=sftp_publisher)
+    sftp_publisher.connect()
+    sftp_publisher.remove(f"{config.SFTP_PATH}/{notice.ted_id}.zip")
+    sftp_publisher.disconnect()
+    assert not sftp_publisher.is_connected