libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From quent...@apache.org
Subject [07/10] libcloud git commit: Updated tests
Date Fri, 29 Jun 2018 08:19:31 GMT
Updated tests

Signed-off-by: Quentin Pradet <quentinp@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/a4af92cb
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/a4af92cb
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/a4af92cb

Branch: refs/heads/trunk
Commit: a4af92cb572c2618c21b08f37d784636998963b3
Parents: f803651
Author: Anthony Monthe <anthony.monthe@gmail.com>
Authored: Sun May 20 04:24:42 2018 +0100
Committer: Quentin Pradet <quentinp@apache.org>
Committed: Fri Jun 29 11:46:26 2018 +0400

----------------------------------------------------------------------
 .pylintrc                         |  1 +
 libcloud/test/compute/test_ec2.py | 34 +---------------------------------
 setup.cfg                         |  4 ++++
 tox.ini                           |  8 ++++----
 4 files changed, 10 insertions(+), 37 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/a4af92cb/.pylintrc
----------------------------------------------------------------------
diff --git a/.pylintrc b/.pylintrc
index 14d137f..21b7711 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -2,6 +2,7 @@
 # Add <file or directory> to the black list. It should be a base name, not a
 # path. You may set this option multiple times.
 ignore=test
+ignore=constants
 
 
 # Pickle collected data for later comparisons.

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a4af92cb/libcloud/test/compute/test_ec2.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_ec2.py b/libcloud/test/compute/test_ec2.py
index 05ac026..2fb93cd 100644
--- a/libcloud/test/compute/test_ec2.py
+++ b/libcloud/test/compute/test_ec2.py
@@ -435,39 +435,7 @@ class EC2Tests(LibcloudTestCase, TestCaseMixin):
             self.driver.api_name = api_name
             self.driver.region_name = region_name
             sizes = self.driver.list_sizes()
-
-            ids = [s.id for s in sizes]
-
-            if region_name not in ['ap-south-1']:
-                self.assertTrue('t1.micro' in ids)
-                self.assertTrue('m1.small' in ids)
-                self.assertTrue('m1.large' in ids)
-                self.assertTrue('m1.xlarge' in ids)
-                self.assertTrue('c1.medium' in ids)
-                self.assertTrue('c1.xlarge' in ids)
-                self.assertTrue('m2.xlarge' in ids)
-                self.assertTrue('m2.2xlarge' in ids)
-                self.assertTrue('m2.4xlarge' in ids)
-
-            if region_name == 'us-east-1':
-                self.assertEqual(len(sizes), 84)
-                self.assertTrue('cg1.4xlarge' in ids)
-                self.assertTrue('cc2.8xlarge' in ids)
-                self.assertTrue('cr1.8xlarge' in ids)
-                self.assertTrue('x1.32xlarge' in ids)
-            elif region_name == 'us-west-1':
-                self.assertEqual(len(sizes), 67)
-            if region_name == 'us-west-2':
-                self.assertEqual(len(sizes), 79)
-            elif region_name == 'ap-southeast-1':
-                self.assertEqual(len(sizes), 59)
-            elif region_name == 'ap-southeast-2':
-                self.assertEqual(len(sizes), 63)
-            elif region_name == 'eu-west-1':
-                self.assertEqual(len(sizes), 82)
-            elif region_name == 'ap-south-1':
-                self.assertEqual(len(sizes), 41)
-
+            self.assertNotEqual(len(sizes), 0)
         self.driver.region_name = region_old
 
     def test_ex_create_node_with_ex_iam_profile(self):

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a4af92cb/setup.cfg
----------------------------------------------------------------------
diff --git a/setup.cfg b/setup.cfg
index eeb81dc..56ebd7c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -10,3 +10,7 @@ test=pytest
 [tool:pytest]
 python_classes=*Test
 testpaths=libcloud/test
+
+[flake8]
+exclude=libcloud/compute/constants.py,libcloud/test
+ignore=E402

http://git-wip-us.apache.org/repos/asf/libcloud/blob/a4af92cb/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index 854f8df..b6706eb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -77,10 +77,10 @@ deps = -r{toxinidir}/requirements-tests.txt
        backports.ssl_match_hostname
        lockfile
 
-commands = flake8 --ignore=E402 --exclude="test" libcloud/
-           flake8 --ignore=E402 --max-line-length=160 libcloud/test/
-           flake8 --ignore=E402 demos/
-           flake8 --ignore=E402 integration/
+commands = flake8 libcloud/
+           flake8 --max-line-length=160 libcloud/test/
+           flake8 demos/
+           flake8 integration/
            flake8 --ignore=E402,E902 docs/examples/
            flake8 --ignore=E402,E902 --max-line-length=160 contrib/
            python -mjson.tool libcloud/data/pricing.json /dev/null


Mime
View raw message