Make integration test not run on CI

mozilla-releng · Sep 26, 2016 · 423f629 · 423f629
1 parent c98a372
commit 423f629
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/pushapkworker/test/integration/test_script.py b/pushapkworker/test/integration/test_script.py
@@ -61,9 +61,11 @@ def _generate_json(self):
 class MainTest(unittest.TestCase):
 
     @unittest.mock.patch('mozapkpublisher.push_apk.PushAPK')
+    @unittest.skipIf(os.environ.get('RUN_NETWORK_TESTS') != 1, 'Tests requiring network are skipped')
     def test_main_downloads_verifies_signature_and_gives_the_right_config_to_mozapkpublisher(self, PushAPK):
         with tempfile.TemporaryDirectory() as test_data_dir:
             keystore_manager = KeystoreManager(test_data_dir)
+            # TODO Download the certificate once it's public
             keystore_manager.add_certificate('/home/jlorenzo/git/mozilla-releng/private/passwords/android-nightly.cer')
 
             config_generator = ConfigFileGenerator(test_data_dir, keystore_manager)

diff --git a/pushapkworker/test/test_jarsigner.py b/pushapkworker/test/test_jarsigner.py
@@ -7,12 +7,6 @@
 from pushapkworker.exceptions import SignatureError
 
 
-class AttrDict(dict):
-    def __init__(self, *args, **kwargs):
-        super(AttrDict, self).__init__(*args, **kwargs)
-        self.__dict__ = self
-
-
 class JarSignerTest(unittest.TestCase):
 
     def setUp(self):

diff --git a/tox.ini b/tox.ini
@@ -12,7 +12,6 @@ passenv =
     TRAVIS_BRANCH
 
 deps =
-    -rrequirements-dev.txt
     coverage>=4.2b1
     flake8
     pytest