test: update tests and makefile

skyme5 · Oct 13, 2021 · fb75ab8 · fb75ab8
1 parent 8d2f873
commit fb75ab8
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -51,13 +51,13 @@ clean-test: ## remove test and coverage artifacts
 lint: ## check style with flake8
 	black snapchat_dl tests
 
-test: ## run tests quickly with the default Python
+test: clean-test ## run tests quickly with the default Python
 	pytest tests --cache-clear
 
-test-all: ## run tests on every Python version with tox
+test-all: clean-test ## run tests on every Python version with tox
 	pytest tests --cache-clear
 
-coverage: ## check code coverage quickly with the default Python
+coverage: clean-test ## check code coverage quickly with the default Python
 	coverage run -m pytest -v tests
 	coverage report -m --skip-covered
 	coverage html

diff --git a/tests/mock_data/invalidusername-nostories.html b/tests/mock_data/invalidusername-nostories.html
diff --git a/tests/mock_data/invalidusername.html b/tests/mock_data/invalidusername.html
diff --git a/tests/mock_data/invalidusername.json b/tests/mock_data/invalidusername.json
@@ -12,37 +12,37 @@
                 "id": "1PgHW1XZSgWteDhyTiIFbgAAgcnlmYnB0ZWpiAXxms2FCAXxms17GAAAAAA",
                 "media": {
                     "type": "VIDEO",
-                    "mediaUrl": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/images/ForBiggerJoyrides.jpg",
-                    "mediaStreamingUrl": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/images/ForBiggerJoyrides.jpg",
-                    "mediaPreviewUrl": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/images/ForBiggerJoyrides.jpg"
+                    "mediaUrl": "https://filesamples.com/samples/video/mp4/sample_640x360.mp4",
+                    "mediaStreamingUrl": "https://filesamples.com/samples/video/mp4/sample_640x360.mp4",
+                    "mediaPreviewUrl": "https://filesamples.com/samples/video/mp4/sample_640x360.mp4"
                 },
                 "overlayImage": {
-                    "mediaUrl": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/images/ForBiggerJoyrides.jpg",
-                    "mediaStreamingUrl": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/images/ForBiggerJoyrides.jpg"
+                    "mediaUrl": "https://filesamples.com/samples/video/mp4/sample_640x360.mp4",
+                    "mediaStreamingUrl": "https://filesamples.com/samples/video/mp4/sample_640x360.mp4"
                 },
                 "captureTimeSecs": "1633810603"
             },
             {
                 "id": "1PgHW1XZSgWteDhyTiIFbgAAgZWZqZ2t2ZGN4AXxpJwZoAXxpJwRfAAAAAA",
                 "media": {
                     "type": "IMAGE",
-                    "mediaUrl": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/images/ForBiggerJoyrides.jpg"
+                    "mediaUrl": "https://filesamples.com/samples/video/mp4/sample_640x360.mp4"
                 },
                 "captureTimeSecs": "1633851737"
             },
             {
                 "id": "1PgHW1XZSgWteDhyTiIFbgAAgdGlyeXpodGx4AXxpR4jsAXxpR4XzAAAAAA",
                 "media": {
                     "type": "IMAGE",
-                    "mediaUrl": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/images/ForBiggerJoyrides.jpg"
+                    "mediaUrl": "https://filesamples.com/samples/video/mp4/sample_640x360.mp4"
                 },
                 "captureTimeSecs": "1633853867"
             },
             {
                 "id": "1PgHW1XZSgWteDhyTiIFbgAAgdnJlc2hjeWd5AXxqhQjjAXxqhQaeAAAAAA",
                 "media": {
                     "type": "IMAGE",
-                    "mediaUrl": "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/images/ForBiggerJoyrides.jpg"
+                    "mediaUrl": "https://filesamples.com/samples/video/mp4/sample_640x360.mp4"
                 },
                 "captureTimeSecs": "1633874675"
             }

diff --git a/tests/test_downlaoder.py b/tests/test_downlaoder.py
@@ -8,29 +8,30 @@
 from snapchat_dl.downloader import download_url
 
 
+def teardown_module(module):
+    shutil.rmtree(".test-data")
+
+
 class Test_downloader(unittest.TestCase):
     """Tests for `snapchat_dl.downloader.download_url` package."""
 
     def setUp(self):
         """Set up test fixtures."""
-        self.test_url = "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerJoyrides.mp4"
+        self.test_url = "https://filesamples.com/samples/video/mp4/sample_640x360.mp4"
         self.test_url404 = "https://google.com/error.html"
-        self.username = "invalidusername"
-
-    @classmethod
-    def tearDownClass(cls):
-        """Tear down test fixtures."""
-        for file in ["test_dl_23.mp4", "test_dl_23.html"]:
-            if os.path.isfile(file):
-                os.remove(file)
 
     def test_download_url(self):
         """Test snapchat_dl download_url."""
-        with open("test_dl_23.mp4", "a") as f:
-            f.close()
-        download_url(self.test_url, "test_dl_23", sleep_interval=0)
+        download_url(self.test_url, ".test-data/test_dl_23.mp4", sleep_interval=0)
+
+    def test_empty_download(self):
+        """Test snapchat_dl download_url."""
+        open(".test-data/test_dl_23.mp4", "w").close()
+        download_url(self.test_url, ".test-data/test_dl_23.mp4", sleep_interval=0)
 
     def test_download_url_raise(self):
         """Test snapchat_dl download_url with invalid url."""
         with self.assertRaises(HTTPError):
-            download_url(self.test_url404, "test_dl_23", sleep_interval=0)
+            download_url(
+                self.test_url404, ".test-data/test_dl_23.mp4", sleep_interval=0
+            )
diff --git a/tests/test_snapchat_dl.py b/tests/test_snapchat_dl.py
@@ -12,7 +12,7 @@
 
 
 def teardown_module(module):
-    os.system("rm -rf .test-data")
+    shutil.rmtree(".test-data")
 
 
 class TestSnapchat_dl(unittest.TestCase):
@@ -23,24 +23,34 @@ def setUp(self):
         self.snapchat_dl = SnapchatDL(
             limit_story=10, quiet=True, directory_prefix=".test-data", dump_json=True,
         )
-        self.test_url = "http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/ForBiggerJoyrides.mp4"
+        self.test_url = "https://filesamples.com/samples/video/mp4/sample_640x360.mp4"
         self.test_url404 = "https://google.com/error.html"
         self.username = "invalidusername"
         self.html = open(
             "tests/mock_data/invalidusername.html", "r", encoding="utf8"
         ).read()
+        self.html_nostories = open(
+            "tests/mock_data/invalidusername-nostories.html", "r", encoding="utf8"
+        ).read()
 
     def test_class_init(self):
         """Test snapchat_dl init."""
         self.assertTrue(self.snapchat_dl)
 
-    def test_get_stories_no_stories(self):
+    def test_invalid_username(self):
         """Test snapchat_dl Stories are not available."""
         with self.assertRaises(APIResponseError):
             self.snapchat_dl.download("username")
 
     @mock.patch("snapchat_dl.snapchat_dl.SnapchatDL._api_response")
-    def test_get_stories_web_ok(self, api_response):
+    def test_get_stories(self, api_response):
         """Test snapchat_dl Download."""
         api_response.return_value = self.html
         self.snapchat_dl.download(self.username)
+
+    @mock.patch("snapchat_dl.snapchat_dl.SnapchatDL._api_response")
+    def test_no_stories(self, api_response):
+        """Test snapchat_dl Download."""
+        api_response.return_value = self.html_nostories
+        with self.assertRaises(NoStoriesAvailable):
+            self.snapchat_dl.download(self.username)