Merge branch 'bugs/402' into pkgs_sep_prep

Conflicts:
	letsencrypt/tests/client_test.py
	tox.ini

acme/challenges_test.py

@@ -454,4 +454,4 @@ class DNSResponseTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

acme/fields_test.py

@@ -33,3 +33,7 @@ class RFC3339FieldTest(unittest.TestCase):
         from acme.fields import RFC3339Field
         self.assertRaises(
             jose.DeserializationError, RFC3339Field.default_decoder, '')
+
+
+if __name__ == '__main__':
+    unittest.main()  # pragma: no cover

acme/jose/b64_test.py

@@ -69,4 +69,4 @@ class B64DecodeTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

acme/jose/errors_test.py

@@ -14,4 +14,4 @@ class UnrecognizedTypeErrorTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

acme/jose/interfaces_test.py

@@ -112,4 +112,4 @@ class JSONDeSerializableTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

acme/jose/json_util_test.py

@@ -294,4 +294,4 @@ class TypedJSONObjectWithFieldsTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

acme/jose/jwa_test.py

@@ -102,4 +102,4 @@ class JWARSTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

acme/jose/jwk_test.py

@@ -104,4 +104,4 @@ class JWKRSATest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

acme/jose/jws_test.py

@@ -238,4 +238,4 @@ class CLITest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

acme/jose/util_test.py

@@ -137,4 +137,4 @@ class frozendictTest(unittest.TestCase):  # pylint: disable=invalid-name
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

acme/messages2_test.py

@@ -246,4 +246,4 @@ class RevocationTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

acme/messages_test.py

@@ -477,4 +477,4 @@ class StatusRequestTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

acme/other_test.py

@@ -96,4 +96,4 @@ class SignatureTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/plugins/common_test.py

@@ -58,4 +58,4 @@ class PluginTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/plugins/disco_test.py

@@ -239,4 +239,4 @@ class PluginsRegistryTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/plugins/standalone/tests/authenticator_test.py

@@ -594,4 +594,4 @@ class InitTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/account_test.py

@@ -208,4 +208,4 @@ class SafeEmailTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/achallenges_test.py

@@ -43,4 +43,4 @@ class DVSNITest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/auth_handler_test.py

@@ -458,4 +458,4 @@ def gen_path(required, challs):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/cli_test.py

@@ -32,4 +32,4 @@ class CLITest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/client_test.py

@@ -27,11 +27,11 @@ class DetermineAccountTest(unittest.TestCase):
 
     @mock.patch("letsencrypt.account.Account.from_prompts")
     @mock.patch("letsencrypt.client.display_ops.choose_account")
-    def determine_account(self, mock_op, mock_prompt):
+    def test_determine_account(self, mock_op, mock_prompt):
         """Test determine account"""
         from letsencrypt import client
 
-        key = le_util.Key("file", "pem")
+        key = le_util.Key(tempfile.mkstemp()[1], "pem")
         test_acc = account.Account(self.config, key, "email1@gmail.com")
         mock_op.return_value = test_acc
 
@@ -77,4 +77,4 @@ class RollbackTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/configuration_test.py

@@ -49,4 +49,4 @@ class NamespaceConfigTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/continuity_auth_test.py

@@ -80,4 +80,4 @@ def gen_client_resp(chall):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/crypto_util_test.py

@@ -151,4 +151,4 @@ class MakeSSCertTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/display/enhancements_test.py

@@ -55,4 +55,4 @@ class RedirectTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/display/ops_test.py

@@ -316,4 +316,4 @@ class SuccessInstallationTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/display/revocation_test.py

@@ -100,4 +100,4 @@ class ConfirmRevocationTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/display/util_test.py

@@ -346,4 +346,4 @@ class PlaceParensTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/le_util_test.py

@@ -123,4 +123,4 @@ class UniqueFileTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/log_test.py

@@ -45,4 +45,4 @@ class DialogHandlerTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/network2_test.py

@@ -479,4 +479,4 @@ class NetworkTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/recovery_token_test.py

@@ -77,4 +77,4 @@ class RecoveryTokenTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/reverter_test.py

@@ -441,4 +441,4 @@ def update_file(filename, string):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt/tests/revoker_test.py

@@ -399,4 +399,4 @@ def create_revoker_certs():
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt_apache/tests/configurator_test.py

@@ -210,4 +210,4 @@ class TwoVhost80Test(util.ApacheTest):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt_apache/tests/dvsni_test.py

@@ -171,4 +171,4 @@ class DvsniPerformTest(util.ApacheTest):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt_apache/tests/obj_test.py

@@ -65,4 +65,4 @@ class VirtualHostTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt_apache/tests/parser_test.py

@@ -125,4 +125,4 @@ class ApacheParserTest(util.ApacheTest):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt_nginx/tests/configurator_test.py

@@ -263,4 +263,4 @@ class NginxConfiguratorTest(util.NginxTest):
         self.assertTrue(self.config.config_test())
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt_nginx/tests/dvsni_test.py

@@ -89,4 +89,4 @@ class DvsniPerformTest(util.NginxTest):
         self.assertEqual(mock_save.call_count, 1)
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt_nginx/tests/nginxparser_test.py

@@ -105,4 +105,4 @@ class TestRawNginxParser(unittest.TestCase):
 
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt_nginx/tests/obj_test.py

@@ -102,4 +102,4 @@ class VirtualHostTest(unittest.TestCase):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

letsencrypt_nginx/tests/parser_test.py

@@ -204,4 +204,4 @@ class NginxParserTest(util.NginxTest):
 
 
 if __name__ == "__main__":
-    unittest.main()
+    unittest.main()  # pragma: no cover

setup.cfg

@@ -8,3 +8,4 @@ dev = develop easy_install letsencrypt[dev,docs,testing]
 nocapture=1
 cover-package=letsencrypt,acme,letsencrypt_apache,letsencrypt_nginx
 cover-erase=1
+cover-tests=1

tox.cover.sh

@@ -9,13 +9,14 @@ cover () {
   # --with-cover add up, --cover-erase must not be set for coveralls
   # to get all the data); --with-cover scopes coverage to only
   # specific package, positional argument scopes tests only to
-  # specific package directory
-  nosetests -c /dev/null --with-cover --cover-package "$1" \
-            --cover-min-percentage="$2" "$1"
+  # specific package directory; --cover-tests makes sure every tests
+  # is run (c.f. #403)
+  nosetests -c /dev/null --with-cover --cover-tests --cover-package  \
+            "$1" --cover-min-percentage="$2" "$1"
 }
 
 # don't use sequential composition (;), if letsencrypt_nginx returns
 # 0, coveralls submit will be triggered (c.f. .travis.yml,
 # after_success)
-cover letsencrypt 88 && cover acme 100 && \
-    cover letsencrypt_apache 67 && cover letsencrypt_nginx 90
+cover letsencrypt 94 && cover acme 99 && \
+    cover letsencrypt_apache 78 && cover letsencrypt_nginx 94