77
88@pytest .mark .parametrize ("nc" , NC_TO_TEST )
99def test_available (nc ):
10- assert nc .users_statuses .available
10+ assert nc .users_status .available
1111
1212
1313def compare_user_statuses (p1 , p2 ):
@@ -21,9 +21,9 @@ def compare_user_statuses(p1, p2):
2121@pytest .mark .parametrize ("nc" , NC_TO_TEST )
2222@pytest .mark .parametrize ("message" , ("1 2 3" , None , "" ))
2323def test_get_status (nc , message ):
24- nc .users_statuses .set (message )
25- r1 = nc .users_statuses .get_current ()
26- r2 = nc .users_statuses .get (nc .user )
24+ nc .users_status .set (message )
25+ r1 = nc .users_status .get_current ()
26+ r2 = nc .users_status .get (nc .user )
2727 compare_user_statuses (r1 , r2 )
2828 assert r1 ["userId" ] == "admin"
2929 assert r1 ["icon" ] is None
@@ -37,12 +37,12 @@ def test_get_status(nc, message):
3737
3838@pytest .mark .parametrize ("nc" , NC_TO_TEST )
3939def test_get_status_non_existent_user (nc ):
40- assert nc .users_statuses .get ("no such user" ) is None
40+ assert nc .users_status .get ("no such user" ) is None
4141
4242
4343@pytest .mark .parametrize ("nc" , NC_TO_TEST )
4444def test_get_predefined (nc ):
45- r = nc .users_statuses .get_predefined ()
45+ r = nc .users_status .get_predefined ()
4646 if nc .srv_version ["major" ] < 27 :
4747 assert r == []
4848 else :
@@ -57,10 +57,10 @@ def test_get_predefined(nc):
5757
5858@pytest .mark .parametrize ("nc" , NC_TO_TEST )
5959def test_get_list (nc ):
60- r_all = nc .users_statuses .get_list ()
60+ r_all = nc .users_status .get_list ()
6161 assert r_all
6262 assert isinstance (r_all , list )
63- r_current = nc .users_statuses .get_current ()
63+ r_current = nc .users_status .get_current ()
6464 for i in r_all :
6565 if i ["userId" ] == nc .user :
6666 compare_user_statuses (i , r_current )
@@ -69,18 +69,18 @@ def test_get_list(nc):
6969@pytest .mark .parametrize ("nc" , NC_TO_TEST )
7070def test_set_status (nc ):
7171 time_clear = int (time ()) + 60
72- nc .users_statuses .set ("cool status" , time_clear )
73- r = nc .users_statuses .get_current ()
72+ nc .users_status .set ("cool status" , time_clear )
73+ r = nc .users_status .get_current ()
7474 assert r ["message" ] == "cool status"
7575 assert r ["clearAt" ] == time_clear
7676 assert r ["icon" ] is None
77- nc .users_statuses .set ("Sick!" , status_icon = '🤒' )
78- r = nc .users_statuses .get_current ()
77+ nc .users_status .set ("Sick!" , status_icon = '🤒' )
78+ r = nc .users_status .get_current ()
7979 assert r ["message" ] == "Sick!"
8080 assert r ["clearAt" ] is None
8181 assert r ["icon" ] == '🤒'
82- nc .users_statuses .set (None )
83- r = nc .users_statuses .get_current ()
82+ nc .users_status .set (None )
83+ r = nc .users_status .get_current ()
8484 assert r ["message" ] is None
8585 assert r ["clearAt" ] is None
8686 assert r ["icon" ] is None
@@ -89,8 +89,8 @@ def test_set_status(nc):
8989@pytest .mark .parametrize ("nc" , NC_TO_TEST )
9090@pytest .mark .parametrize ("value" , ("online" , "away" , "dnd" , "invisible" , "offline" ))
9191def test_set_status_type (nc , value ):
92- nc .users_statuses .set_status_type (value )
93- r = nc .users_statuses .get_current ()
92+ nc .users_status .set_status_type (value )
93+ r = nc .users_status .get_current ()
9494 assert r ["status" ] == value
9595 assert r ["statusIsUserDefined" ]
9696
@@ -99,12 +99,12 @@ def test_set_status_type(nc, value):
9999@pytest .mark .parametrize ("clear_at" , (None , int (time ()) + 360 ))
100100def test_set_predefined (nc , clear_at ):
101101 if nc .srv_version ["major" ] < 27 :
102- nc .users_statuses .set_predefined ("meeting" )
102+ nc .users_status .set_predefined ("meeting" )
103103 else :
104- predefined_statuses = nc .users_statuses .get_predefined ()
104+ predefined_statuses = nc .users_status .get_predefined ()
105105 for i in predefined_statuses :
106- nc .users_statuses .set_predefined (i ["id" ], clear_at )
107- r = nc .users_statuses .get_current ()
106+ nc .users_status .set_predefined (i ["id" ], clear_at )
107+ r = nc .users_status .get_current ()
108108 assert r ["message" ] == i ["message" ]
109109 assert r ["messageId" ] == i ["id" ]
110110 assert r ["messageIsPredefined" ]
@@ -118,18 +118,18 @@ def test_get_back_status_from_from_empty_user(nc):
118118 nc ._session .user = ""
119119 try :
120120 with pytest .raises (ValueError ):
121- nc .users_statuses .get_backup_status ("" )
121+ nc .users_status .get_backup_status ("" )
122122 finally :
123123 nc ._session .user = orig_user
124124
125125
126126@pytest .mark .parametrize ("nc" , NC_TO_TEST )
127127@pytest .mark .skipif (NC_VERSION ["major" ] < 27 , reason = "Run only on NC27+" )
128128def test_get_back_status_from_from_non_exist_user (nc ):
129- assert nc .users_statuses .get_backup_status ("mёm_m-m.l" ) is None
129+ assert nc .users_status .get_backup_status ("mёm_m-m.l" ) is None
130130
131131
132132@pytest .mark .parametrize ("nc" , NC_TO_TEST )
133133@pytest .mark .skipif (NC_VERSION ["major" ] < 27 , reason = "Run only on NC27+" )
134134def test_restore_from_non_existing_back_status (nc ):
135- assert nc .users_statuses .restore_backup_status ("no such backup status" ) is None
135+ assert nc .users_status .restore_backup_status ("no such backup status" ) is None
0 commit comments