@@ -21,14 +21,18 @@ def setUp(self):
2121 # Create authority file.
2222 self .authfile = os .path .join (os .getenv ("HOME" ), ".Xauthority" )
2323 self .cookie = "926e3f51b3540ca0d54bf2725c1af2b6"
24- os .system ("xauth -f {0} add :99.0 MIT-MAGIC-COOKIE-1 {1}" .format (self .authfile , self .cookie ))
25- self .display = Xlib .display .Display (":99.0" )
24+ self .display_num = os .getenv ("DISPLAY" )
25+ os .system ("xauth -f {0} add {1} MIT-MAGIC-COOKIE-1 {2}" .format (self .authfile , self .display_num ,
26+ self .cookie ))
27+ self .display = Xlib .display .Display (self .display_num )
28+ self .dummy_str = "qqq"
29+ self .keysym = 65535
2630
2731 def test_display_instance (self ):
2832 self .assertTrue (isinstance (self .display , Xlib .display .Display ))
2933
3034 def test_default_display_name (self ):
31- self .assertEqual (self .display .get_display_name (), ":99.0" )
35+ self .assertEqual (self .display .get_display_name (), self . display_num )
3236
3337 def test_default_screen_number (self ):
3438 self .assertEqual (self .display .get_default_screen (), 0 )
@@ -50,13 +54,13 @@ def test_can_close_display(self):
5054
5155 def test_can_close_display_and_check_for_error (self ):
5256 self .display .close ()
53- self .assertRaises (self .display .flush )
57+ self .assertRaises (Xlib . error . ConnectionClosedError , self .display .flush )
5458
5559 def test_return_fileno (self ):
5660 self .assertTrue (isinstance (self .display .fileno (), int ))
5761
5862 def test_has_no_invalid_extension (self ):
59- self .assertTrue (~ self .display .has_extension ("QQQ" ))
63+ self .assertTrue (~ self .display .has_extension (self . dummy_str ))
6064
6165 def test_has_valid_extension (self ):
6266 extensions = self .display .list_extensions ()
@@ -94,7 +98,7 @@ def test_keysym_to_keycode_for_nosymbol(self):
9498 self .assertEqual (self .display .keysym_to_keycode (Xlib .X .NoSymbol ), 0 )
9599
96100 def test_keysym_to_keycode_for_valid_symbol (self ):
97- self .assertEqual (self .display .keysym_to_keycode (65535L ), 119 )
101+ self .assertEqual (self .display .keysym_to_keycode (self . keysym ), 119 )
98102
99103 def test_keysym_to_keycodes_for_nosymbol (self ):
100104 self .assertEqual (self .display .keysym_to_keycodes (Xlib .X .NoSymbol ), [])
@@ -128,14 +132,14 @@ def test_get_font_path(self):
128132 self .assertNotEqual (self .display .get_font_path (), [])
129133
130134 def test_get_atom_name (self ):
131- atom = self .display .get_atom (":99.0" )
135+ atom = self .display .get_atom (self . display_num )
132136 val = self .display .get_atom_name (atom )
133- self .assertEqual (val , ":99.0" )
137+ self .assertEqual (val , self . display_num )
134138
135139 def test_intern_atom (self ):
136- atom = self .display .intern_atom (":99.0" )
140+ atom = self .display .intern_atom (self . display_num )
137141 val = self .display .get_atom_name (atom )
138- self .assertEqual (val , ":99.0" )
142+ self .assertEqual (val , self . display_num )
139143
140144 def test_get_input_focus (self ):
141145 self .assertTrue (isinstance (self .display .get_input_focus (), Xlib .protocol .request .GetInputFocus ))
@@ -144,24 +148,24 @@ def test_query_keymap(self):
144148 self .assertTrue (isinstance (self .display .query_keymap (), list ))
145149
146150 def test_open_invalid_font (self ):
147- self .assertEqual (self .display .open_font ("QQQ" ), None )
151+ self .assertEqual (self .display .open_font (self . dummy_str ), None )
148152
149153 def test_list_fonts (self ):
150154 fonts = self .display .list_fonts ("*" , 1 )
151155 self .assertNotEqual (fonts , [])
152156
153157 def test_lookup_valid_keysym (self ):
154- self .assertNotEqual (self .display .lookup_string (65535L ), None )
158+ self .assertNotEqual (self .display .lookup_string (self . keysym ), None )
155159
156160 def test_lookup_invalid_keysym (self ):
157161 self .assertEqual (self .display .lookup_string (- 1 ), None )
158162
159163 def test_rebind_string (self ):
160- self .display .rebind_string (65535L , "qqq" )
161- self .assertEqual (self .display .lookup_string (65535L ), "qqq" )
164+ self .display .rebind_string (self . keysym , self . dummy_str )
165+ self .assertEqual (self .display .lookup_string (self . keysym ), self . dummy_str )
162166
163167 def test_get_selection_owner (self ):
164- atom = self .display .get_atom (":99.0" )
168+ atom = self .display .get_atom (self . display_num )
165169 self .assertEqual (self .display .get_selection_owner (atom ), 0 )
166170
167171 def tearDown (self ):
0 commit comments