@@ -42,7 +42,7 @@ def test_can_extract_federated_connections(self):
4242 connections = parser .get_connections ()
4343 self .assertIsInstance (connections , list )
4444 self .assertIsInstance (connections [0 ], Connection )
45- self .assertEqual (connections [0 ].dbname , 'testv1 ' )
45+ self .assertEqual (connections [0 ].dbname , 'TestV1 ' )
4646
4747
4848class ConnectionModelTests (unittest .TestCase ):
@@ -54,18 +54,18 @@ def test_can_read_attributes_from_connection(self):
5454 conn = Connection (self .connection )
5555 self .assertEqual (conn .dbname , 'TestV1' )
5656 self .assertEqual (conn .username , '' )
57- self .assertEqual (conn .server, 'mssql2012.test.tsi.lan ' )
57+ self .assertEqual (conn .server , 'mssql2012' )
5858 self .assertEqual (conn .dbclass , 'sqlserver' )
5959 self .assertEqual (conn .authentication , 'sspi' )
6060
6161 def test_can_write_attributes_to_connection (self ):
6262 conn = Connection (self .connection )
6363 conn .dbname = 'BubblesInMyDrink'
64- conn .server = 'mssql2014.test.tsi.lan '
64+ conn .server = 'mssql2014'
6565 conn .username = 'bob'
6666 self .assertEqual (conn .dbname , 'BubblesInMyDrink' )
6767 self .assertEqual (conn .username , 'bob' )
68- self .assertEqual (conn .server , 'mssql2014.test.tsi.lan ' )
68+ self .assertEqual (conn .server , 'mssql2014' )
6969
7070 def test_bad_dbclass_rasies_attribute_error (self ):
7171 conn = Connection (self .connection )
@@ -117,15 +117,15 @@ def test_can_extract_connection(self):
117117
118118 def test_can_save_tds (self ):
119119 original_tds = Datasource .from_file (self .tds_file .name )
120- original_tds .connections [0 ].dbname = 'newdb.test.tsi.lan '
120+ original_tds .connections [0 ].dbname = 'newdb'
121121 original_tds .save ()
122122
123123 new_tds = Datasource .from_file (self .tds_file .name )
124- self .assertEqual (new_tds .connections [0 ].dbname , 'newdb.test.tsi.lan ' )
124+ self .assertEqual (new_tds .connections [0 ].dbname , 'newdb' )
125125
126126 def test_save_has_xml_declaration (self ):
127127 original_tds = Datasource .from_file (self .tds_file .name )
128- original_tds .connections [0 ].dbname = 'newdb.test.tsi.lan '
128+ original_tds .connections [0 ].dbname = 'newdb'
129129
130130 original_tds .save ()
131131
@@ -158,11 +158,11 @@ def test_can_extract_connection(self):
158158
159159 def test_can_save_tds (self ):
160160 original_tds = Datasource .from_file (self .tds_file .name )
161- original_tds .connections [0 ].dbname = 'newdb.test.tsi.lan '
161+ original_tds .connections [0 ].dbname = 'newdb'
162162 original_tds .save ()
163163
164164 new_tds = Datasource .from_file (self .tds_file .name )
165- self .assertEqual (new_tds .connections [0 ].dbname , 'newdb.test.tsi.lan ' )
165+ self .assertEqual (new_tds .connections [0 ].dbname , 'newdb' )
166166
167167
168168class DatasourceModelV10TDSXTests (unittest .TestCase ):
@@ -183,22 +183,22 @@ def test_can_open_tdsx(self):
183183
184184 def test_can_open_tdsx_and_save_changes (self ):
185185 original_tdsx = Datasource .from_file (self .tdsx_file .name )
186- original_tdsx .connections [0 ].server = 'newdb.test.tsi.lan '
186+ original_tdsx .connections [0 ].server = 'newdb'
187187 original_tdsx .save ()
188188
189189 new_tdsx = Datasource .from_file (self .tdsx_file .name )
190190 self .assertEqual (new_tdsx .connections [
191- 0 ].server , 'newdb.test.tsi.lan ' )
191+ 0 ].server , 'newdb' )
192192
193193 def test_can_open_tdsx_and_save_as_changes (self ):
194194 new_tdsx_filename = 'newtdsx.tdsx'
195195 original_wb = Datasource .from_file (self .tdsx_file .name )
196- original_wb .connections [0 ].server = 'newdb.test.tsi.lan '
196+ original_wb .connections [0 ].server = 'newdb'
197197 original_wb .save_as (new_tdsx_filename )
198198
199199 new_wb = Datasource .from_file (new_tdsx_filename )
200200 self .assertEqual (new_wb .connections [
201- 0 ].server , 'newdb.test.tsi.lan ' )
201+ 0 ].server , 'newdb' )
202202 os .unlink (new_tdsx_filename )
203203
204204
@@ -230,12 +230,12 @@ def test_has_filename(self):
230230
231231 def test_can_update_datasource_connection_and_save (self ):
232232 original_wb = Workbook (self .workbook_file .name )
233- original_wb .datasources [0 ].connections [0 ].dbname = 'newdb.test.tsi.lan '
233+ original_wb .datasources [0 ].connections [0 ].dbname = 'newdb'
234234 original_wb .save ()
235235
236236 new_wb = Workbook (self .workbook_file .name )
237237 self .assertEqual (new_wb .datasources [0 ].connections [
238- 0 ].dbname , 'newdb.test.tsi.lan ' )
238+ 0 ].dbname , 'newdb' )
239239
240240
241241class WorkbookModelV10Tests (unittest .TestCase ):
@@ -260,17 +260,17 @@ def test_can_extract_datasourceV10(self):
260260
261261 def test_can_update_datasource_connection_and_saveV10 (self ):
262262 original_wb = Workbook (self .workbook_file .name )
263- original_wb .datasources [0 ].connections [0 ].dbname = 'newdb.test.tsi.lan '
263+ original_wb .datasources [0 ].connections [0 ].dbname = 'newdb'
264264
265265 original_wb .save ()
266266
267267 new_wb = Workbook (self .workbook_file .name )
268268 self .assertEqual (new_wb .datasources [0 ].connections [
269- 0 ].dbname , 'newdb.test.tsi.lan ' )
269+ 0 ].dbname , 'newdb' )
270270
271271 def test_save_has_xml_declaration (self ):
272272 original_wb = Workbook (self .workbook_file .name )
273- original_wb .datasources [0 ].connections [0 ].dbname = 'newdb.test.tsi.lan '
273+ original_wb .datasources [0 ].connections [0 ].dbname = 'newdb'
274274
275275 original_wb .save ()
276276
@@ -298,22 +298,22 @@ def test_can_open_twbx(self):
298298
299299 def test_can_open_twbx_and_save_changes (self ):
300300 original_wb = Workbook (self .workbook_file .name )
301- original_wb .datasources [0 ].connections [0 ].server = 'newdb.test.tsi.lan '
301+ original_wb .datasources [0 ].connections [0 ].server = 'newdb'
302302 original_wb .save ()
303303
304304 new_wb = Workbook (self .workbook_file .name )
305305 self .assertEqual (new_wb .datasources [0 ].connections [
306- 0 ].server , 'newdb.test.tsi.lan ' )
306+ 0 ].server , 'newdb' )
307307
308308 def test_can_open_twbx_and_save_as_changes (self ):
309309 new_twbx_filename = 'newtwbx.twbx'
310310 original_wb = Workbook (self .workbook_file .name )
311- original_wb .datasources [0 ].connections [0 ].server = 'newdb.test.tsi.lan '
311+ original_wb .datasources [0 ].connections [0 ].server = 'newdb'
312312 original_wb .save_as (new_twbx_filename )
313313
314314 new_wb = Workbook (new_twbx_filename )
315315 self .assertEqual (new_wb .datasources [0 ].connections [
316- 0 ].server , 'newdb.test.tsi.lan ' )
316+ 0 ].server , 'newdb' )
317317
318318 os .unlink (new_twbx_filename )
319319
0 commit comments