Merge branch 'master' into work

greenbone · Jun 15, 2018 · 1cb006b · 1cb006b
2 parents 8a6e02d + f9354e9
commit 1cb006b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/tests/testArgumentsParser.py b/tests/testArgumentsParser.py
@@ -53,7 +53,6 @@ def testExistingKey(self):
         args = get_common_args(self.parser, '-k /etc/passwd'.split())
         self.assertEqual('/etc/passwd', args['keyfile'])
 
-
-    def testDefaultLogLevel(self):
+    def testDefaultKey(self):
         args = get_common_args(self.parser, [])
         self.assertEqual(misc.KEY_FILE, args['keyfile'])
diff --git a/tox.ini b/tox.ini
@@ -1,4 +1,5 @@
 [tox]
-envlist=py27, py33, py34, pypy
+envlist=py35, py36, pypy
+skip_missing_interpreters=True
 [testenv]
 commands={envpython} setup.py test