Run flake8 on tests/ folder

LD250 · LD250 · commit decbc3a3e02d · 2018-12-06T13:25:02.000+01:00
diff --git a/tests/integration/actions/test_actions.py b/tests/integration/actions/test_actions.py
@@ -1,6 +1,3 @@
-import mock
-import pytest
-
 
 class TestActionsClient(object):
     def test_get_by_id(self, hetzner_client):
diff --git a/tests/integration/server_types/test_server_types.py b/tests/integration/server_types/test_server_types.py
@@ -1,6 +1,3 @@
-import pytest
-import mock
-
 
 class TestServerTypesClient(object):
 
@@ -50,4 +47,4 @@ def test_get_all(self, hetzner_client):
             }
         ]
         assert server_types[0].storage_type == "local"
-        assert server_types[0].cpu_type == "shared"
+        assert server_types[0].cpu_type == "shared"
diff --git a/tests/integration/servers/test_servers.py b/tests/integration/servers/test_servers.py
@@ -8,6 +8,7 @@
 from hcloud.iso.domain import Iso
 from hcloud.server_types.domain import ServerType
 
+
 class TestBoundServer(object):
 
     @pytest.fixture()
@@ -283,7 +284,7 @@ def test_create_image(self, hetzner_client, server):
         assert response.image.description == "my image"
 
     @pytest.mark.parametrize("server", [Server(id=1), BoundServer(mock.MagicMock(), dict(id=1))])
-    def test_enable_backup(self, hetzner_client, server):
+    def test_rebuild(self, hetzner_client, server):
         action = hetzner_client.servers.rebuild(server, Image(name="ubuntu-16.04"))
 
         assert action.id == 13
diff --git a/tests/unit/actions/test_client.py b/tests/unit/actions/test_client.py
@@ -35,4 +35,3 @@ def test_get_all_no_params(self, actions_client, generic_action_list):
         assert action2._client is actions_client
         assert action2.id == 2
         assert action2.command == "stop_server"
-
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
@@ -9,6 +9,7 @@ def mocked_requests():
     yield mocked_requests
     patcher.stop()
 
+
 @pytest.fixture()
 def generic_action():
     return {
@@ -30,4 +31,4 @@ def generic_action():
                 "message": "Action failed"
             }
         }
-    }
+    }
diff --git a/tests/unit/core/test_client.py b/tests/unit/core/test_client.py
@@ -53,11 +53,9 @@ def test_get_filled_model_attribute_incomplete_model(self, bound_model_class, cl
         assert id == 101
         assert bound_model.complete is False
 
-
     def test_get_non_exists_model_attribute_incomplete_model(self, bound_model_class, client):
         bound_model = bound_model_class(client=client, data={"id": 1}, complete=False)
         with pytest.raises(AttributeError):
             bound_model.content
         client.get_by_id.assert_not_called()
         assert bound_model.complete is False
-
diff --git a/tests/unit/helpers/test_descriptors.py b/tests/unit/helpers/test_descriptors.py
@@ -27,11 +27,10 @@ def test_created_assigned_valid(self, entity_with_descriptor):
         entity.created = "2016-01-30T23:50+00:00"
         assert entity.created == datetime.datetime(2016, 1, 30, 23, 50, tzinfo=tzoffset(None, 0))
 
-
     def test_created_valid(self, entity_with_descriptor):
         entity = entity_with_descriptor(created="2016-01-30T23:50+00:00")
         assert entity.created == datetime.datetime(2016, 1, 30, 23, 50, tzinfo=tzoffset(None, 0))
 
     def test_created_invalid(self, entity_with_descriptor):
-        with pytest.raises(ValueError) as e:
+        with pytest.raises(ValueError):
             entity_with_descriptor(created="invalid")
diff --git a/tests/unit/server_types/test_client.py b/tests/unit/server_types/test_client.py
@@ -41,4 +41,3 @@ def test_get_all_no_params(self, server_types_client, two_server_types_response)
     def test_get_all_with_params(self, server_types_client, params):
         server_types_client.get_all(**params)
         server_types_client._client.request.assert_called_with(url="/server_types", method="GET", params=params)
-
diff --git a/tests/unit/servers/conftest.py b/tests/unit/servers/conftest.py
@@ -379,73 +379,71 @@ def response_simple_servers():
             "protection": {},
             "labels": {},
             "volumes": []
-        },
-            {
-                "id": 2,
-                "name": "my-server2",
-                "status": "running",
-                "created": "2016-03-30T23:50+00:00",
-                "public_net": {},
-                "server_type": {
-                    "id": 1,
-                    "name": "cx11",
-                    "description": "CX11",
-                    "cores": 1,
-                    "memory": 1,
-                    "disk": 25,
-                    "prices": [
-                        {
-                            "location": "fsn1",
-                            "price_hourly": {
-                                "net": "1.0000000000",
-                                "gross": "1.1900000000000000"
-                            },
-                            "price_monthly": {
-                                "net": "1.0000000000",
-                                "gross": "1.1900000000000000"
-                            }
+        }, {
+            "id": 2,
+            "name": "my-server2",
+            "status": "running",
+            "created": "2016-03-30T23:50+00:00",
+            "public_net": {},
+            "server_type": {
+                "id": 1,
+                "name": "cx11",
+                "description": "CX11",
+                "cores": 1,
+                "memory": 1,
+                "disk": 25,
+                "prices": [
+                    {
+                        "location": "fsn1",
+                        "price_hourly": {
+                            "net": "1.0000000000",
+                            "gross": "1.1900000000000000"
+                        },
+                        "price_monthly": {
+                            "net": "1.0000000000",
+                            "gross": "1.1900000000000000"
                         }
-                    ],
-                    "storage_type": "local",
-                    "cpu_type": "shared"
+                    }
+                ],
+                "storage_type": "local",
+                "cpu_type": "shared"
+            },
+            "datacenter": {},
+            "image": {
+                "id": 4711,
+                "type": "snapshot",
+                "status": "available",
+                "name": "ubuntu-16.04",
+                "description": "Ubuntu 16.04 Standard 64 bit",
+                "image_size": 2.3,
+                "disk_size": 10,
+                "created": "2016-01-30T23:50+00:00",
+                "created_from": {
+                    "id": 1,
+                    "name": "Server"
                 },
-                "datacenter": {},
-                "image": {
-                    "id": 4711,
-                    "type": "snapshot",
-                    "status": "available",
-                    "name": "ubuntu-16.04",
-                    "description": "Ubuntu 16.04 Standard 64 bit",
-                    "image_size": 2.3,
-                    "disk_size": 10,
-                    "created": "2016-01-30T23:50+00:00",
-                    "created_from": {
-                        "id": 1,
-                        "name": "Server"
-                    },
-                    "bound_to": None,
-                    "os_flavor": "ubuntu",
-                    "os_version": "16.04",
-                    "rapid_deploy": False,
-                    "protection": {
-                        "delete": False,
-                        "rebuild": False
-                    },
-                    "deprecated": "2018-02-28T00:00:00+00:00",
-                    "labels": {}
+                "bound_to": None,
+                "os_flavor": "ubuntu",
+                "os_version": "16.04",
+                "rapid_deploy": False,
+                "protection": {
+                    "delete": False,
+                    "rebuild": False
                 },
-                "iso": None,
-                "rescue_enabled": False,
-                "locked": False,
-                "backup_window": "22-02",
-                "outgoing_traffic": 123456,
-                "ingoing_traffic": 123456,
-                "included_traffic": 654321,
-                "protection": {},
-                "labels": {},
-                "volumes": []
+                "deprecated": "2018-02-28T00:00:00+00:00",
+                "labels": {}
             },
-        ]
+            "iso": None,
+            "rescue_enabled": False,
+            "locked": False,
+            "backup_window": "22-02",
+            "outgoing_traffic": 123456,
+            "ingoing_traffic": 123456,
+            "included_traffic": 654321,
+            "protection": {},
+            "labels": {},
+            "volumes": []
+        }]
     }
 
 
diff --git a/tests/unit/servers/test_client.py b/tests/unit/servers/test_client.py
@@ -80,7 +80,7 @@ def test_get_actions(self, hetzner_client, bound_server, response_get_actions):
     def test_update(self, hetzner_client, bound_server, response_update_server):
         hetzner_client.request.return_value = response_update_server
         server = bound_server.update(name="new-name", labels={})
-        hetzner_client.request.assert_called_with(url="/servers/14", method="PUT",json={"name": "new-name", "labels": {}})
+        hetzner_client.request.assert_called_with(url="/servers/14", method="PUT", json={"name": "new-name", "labels": {}})
 
         assert server.id == 14
         assert server.name == "new-name"
@@ -339,6 +339,8 @@ def test_create_with_volumes(self, servers_client, response_create_simple_server
         next_actions = response.next_actions
         root_password = response.root_password
 
+        assert root_password == "YItygq1v3GYjjMomLaKc"
+
         assert bound_server._client is servers_client
         assert bound_server.id == 1
         assert bound_server.name == "my-server"
diff --git a/tests/unit/volumes/conftest.py b/tests/unit/volumes/conftest.py
@@ -28,6 +28,7 @@ def volume_response():
         }
     }
 
+
 @pytest.fixture()
 def two_volumes_response():
     return {
@@ -79,6 +80,7 @@ def two_volumes_response():
         ]
     }
 
+
 @pytest.fixture()
 def volume_create_response():
     return {
diff --git a/tests/unit/volumes/test_client.py b/tests/unit/volumes/test_client.py
@@ -1,4 +1,3 @@
-import mock
 import pytest
 import arrow
 import mock
diff --git a/tox.ini b/tox.ini
@@ -4,7 +4,7 @@ envlist = py27, py34, py35, py36, py37, flake8
 [testenv:flake8]
 basepython = python
 deps = flake8
-commands = flake8 hcloud
+commands = flake8 hcloud tests
 
 [testenv]
 passenv = FAKE_API_ENDPOINT

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,3 @@`
`1`		`-import pytest`
`2`		`-import mock`
`3`		`-`
`4`	`1`
`5`	`2`	`class TestServerTypesClient(object):`
`6`	`3`
`@@ -50,4 +47,4 @@ def test_get_all(self, hetzner_client):`
`50`	`47`	`}`
`51`	`48`	`]`
`52`	`49`	`assert server_types[0].storage_type == "local"`
`53`		`- assert server_types[0].cpu_type == "shared"`
	`50`	`+ assert server_types[0].cpu_type == "shared"`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ def mocked_requests():`
`9`	`9`	`yield mocked_requests`
`10`	`10`	`patcher.stop()`
`11`	`11`
	`12`	`+`
`12`	`13`	`@pytest.fixture()`
`13`	`14`	`def generic_action():`
`14`	`15`	`return {`
`@@ -30,4 +31,4 @@ def generic_action():`
`30`	`31`	`"message": "Action failed"`
`31`	`32`	`}`
`32`	`33`	`}`
`33`		`- }`
	`34`	`+ }`