@@ -61,77 +61,71 @@ def plain_coap_server(self, status_resource, control_resource):
6161 yield server
6262 server .stop ()
6363
64- def test_set_values (self , air_client , monkeypatch ):
64+ def test_set_values (self , air_client ):
6565 values = {}
6666 values ["mode" ] = "A"
6767 result = air_client .set_values (values )
6868 assert result
6969
70- def test_get_status_is_valid (self , air_client , test_data , monkeypatch ):
70+ def test_get_status_is_valid (self , air_client , test_data ):
7171 self .assert_json_data (
7272 air_client .get_status ,
7373 "status" ,
7474 test_data ,
75- monkeypatch ,
7675 air_client ,
7776 )
7877
79- def test_get_firmware_is_valid (self , air_client , test_data , monkeypatch ):
78+ def test_get_firmware_is_valid (self , air_client , test_data ):
8079 self .assert_json_data (
8180 air_client .get_firmware ,
8281 "status" ,
8382 test_data ,
84- monkeypatch ,
8583 air_client ,
8684 )
8785
88- def test_get_filters_is_valid (self , air_client , test_data , monkeypatch ):
86+ def test_get_filters_is_valid (self , air_client , test_data ):
8987 self .assert_json_data (
9088 air_client .get_filters ,
9189 "status" ,
9290 test_data ,
93- monkeypatch ,
9491 air_client ,
9592 )
9693
97- def test_get_cli_status_is_valid (self , air_cli , test_data , monkeypatch , capfd ):
94+ def test_get_cli_status_is_valid (self , air_cli , test_data , capfd ):
9895 self .assert_cli_data (
9996 air_cli .get_status ,
10097 "status-cli" ,
10198 test_data ,
102- monkeypatch ,
10399 air_cli ,
104100 capfd ,
105101 )
106102
107- def test_get_cli_firmware_is_valid (self , air_cli , test_data , monkeypatch , capfd ):
103+ def test_get_cli_firmware_is_valid (self , air_cli , test_data , capfd ):
108104 self .assert_cli_data (
109105 air_cli .get_firmware ,
110106 "firmware-cli" ,
111107 test_data ,
112- monkeypatch ,
113108 air_cli ,
114109 capfd ,
115110 )
116111
117- def test_get_cli_filters_is_valid (self , air_cli , test_data , monkeypatch , capfd ):
112+ def test_get_cli_filters_is_valid (self , air_cli , test_data , capfd ):
118113 self .assert_cli_data (
119114 air_cli .get_filters ,
120115 "fltsts-cli" ,
121116 test_data ,
122- monkeypatch ,
123117 air_cli ,
124118 capfd ,
125119 )
126120
127- def assert_json_data (self , air_func , dataset , test_data , monkeypatch , air_client ):
121+ def assert_json_data (self , air_func , dataset , test_data , air_client ):
128122 result = air_func ()
129123 data = test_data ["plain-coap" ][dataset ]["data" ]
130124 json_data = json .loads (data )
131125 assert result == json_data
132126
133127 def assert_cli_data (
134- self , air_func , dataset , test_data , monkeypatch , air_cli , capfd
128+ self , air_func , dataset , test_data , air_cli , capfd
135129 ):
136130 air_func ()
137131 result , err = capfd .readouterr ()
0 commit comments