@@ -31,6 +31,11 @@ def socket(af, sock_type):
3131mock_requests = MockRequests ()
3232sys .modules ['requests' ] = mock_requests
3333
34+ # These tests need:
35+ # from mpos.net.connectivity_manager import ConnectivityManager
36+ # ...instead of
37+ # from mpos import ConnectivityManager
38+ # ...to make the mocking work.
3439
3540class TestConnectivityManagerWithNetwork (unittest .TestCase ):
3641 """Test ConnectivityManager with network module available."""
@@ -49,7 +54,7 @@ def setUp(self):
4954 del sys .modules ['mpos.net.connectivity_manager' ] # Maybe this doesn't suffic now that it's imported through mpos
5055
5156 # Import fresh
52- from mpos import ConnectivityManager
57+ from mpos . net . connectivity_manager import ConnectivityManager
5358 self .ConnectivityManager = ConnectivityManager
5459
5560 # Reset the singleton instance
@@ -301,7 +306,7 @@ def setUp(self):
301306 if 'mpos.net.connectivity_manager' in sys .modules :
302307 del sys .modules ['mpos.net.connectivity_manager' ]
303308
304- from mpos import ConnectivityManager
309+ from mpos . net . connectivity_manager import ConnectivityManager
305310 self .ConnectivityManager = ConnectivityManager
306311
307312 # Reset the singleton instance
@@ -382,7 +387,7 @@ def setUp(self):
382387 if 'mpos.net.connectivity_manager' in sys .modules :
383388 del sys .modules ['mpos.net.connectivity_manager' ]
384389
385- from mpos import ConnectivityManager
390+ from mpos . net . connectivity_manager import ConnectivityManager
386391 self .ConnectivityManager = ConnectivityManager
387392
388393 ConnectivityManager ._instance = None
@@ -417,7 +422,7 @@ def test_wait_until_online_without_network_module(self):
417422 if 'mpos.net.connectivity_manager' in sys .modules :
418423 del sys .modules ['mpos.net.connectivity_manager' ]
419424
420- from mpos import ConnectivityManager
425+ from mpos . net . connectivity_manager import ConnectivityManager
421426 self .ConnectivityManager = ConnectivityManager
422427 ConnectivityManager ._instance = None
423428
@@ -439,7 +444,7 @@ def setUp(self):
439444 if 'mpos.net.connectivity_manager' in sys .modules :
440445 del sys .modules ['mpos.net.connectivity_manager' ]
441446
442- from mpos import ConnectivityManager
447+ from mpos . net . connectivity_manager import ConnectivityManager
443448 self .ConnectivityManager = ConnectivityManager
444449
445450 ConnectivityManager ._instance = None
@@ -520,13 +525,13 @@ def test_online_offline_online_transitions(self):
520525 # Go offline
521526 self .mock_network .set_connected (False )
522527 timer .callback (timer )
523- self .assertFalse (cm .is_online ())
528+ self .assertFalse (cm .is_online (), "a" )
524529 self .assertEqual (notifications [- 1 ], False )
525530
526531 # Go online
527532 self .mock_network .set_connected (True )
528533 timer .callback (timer )
529- self .assertTrue (cm .is_online ())
534+ self .assertTrue (cm .is_online (), "b" )
530535 self .assertEqual (notifications [- 1 ], True )
531536
532537 # Go offline again
@@ -550,7 +555,7 @@ def setUp(self):
550555 if 'mpos.net.connectivity_manager' in sys .modules :
551556 del sys .modules ['mpos.net.connectivity_manager' ]
552557
553- from mpos import ConnectivityManager
558+ from mpos . net . connectivity_manager import ConnectivityManager
554559 self .ConnectivityManager = ConnectivityManager
555560
556561 ConnectivityManager ._instance = None
0 commit comments