Commit e6a23537ccdecb0bb235f9b6f522776102f47e30

Authored by selurvedu
1 parent 1a39a390

Use OS-independent path separators

@@ -108,10 +108,10 @@ Get Broker Property By Username @@ -108,10 +108,10 @@ Get Broker Property By Username
108 108
109 109
110 Завантажуємо бібліотеку з реалізацією для майданчика ${keywords_file} 110 Завантажуємо бібліотеку з реалізацією для майданчика ${keywords_file}
111 - ${bundled_st}= Run Keyword And Return Status Import Resource ${CURDIR}/brokers/${keywords_file}.robot  
112 - ${external_st}= Run Keyword And Return Status Import Resource ${CURDIR}/../../src/robot_tests.broker.${keywords_file}/${keywords_file}.robot 111 + ${bundled_st}= Run Keyword And Return Status Import Resource ${CURDIR}${/}brokers${/}${keywords_file}.robot
  112 + ${external_st}= Run Keyword And Return Status Import Resource ${CURDIR}${/}..${/}..${/}src${/}robot_tests.broker.${keywords_file}${/}${keywords_file}.robot
113 Run Keyword If ${bundled_st} == ${external_st} == ${False} Fail Resource file ${keywords_file}.robot not found 113 Run Keyword If ${bundled_st} == ${external_st} == ${False} Fail Resource file ${keywords_file}.robot not found
114 - Run Keyword If ${bundled_st} == ${external_st} == ${True} Fail Resource file ${keywords_file}.robot found in both brokers/ and src/ 114 + Run Keyword If ${bundled_st} == ${external_st} == ${True} Fail Resource file ${keywords_file}.robot found in both brokers${/} and src${/}
115 115
116 116
117 Дочекатись синхронізації з майданчиком 117 Дочекатись синхронізації з майданчиком
@@ -95,7 +95,7 @@ def log_object_data(data, file_name=None, format="yaml"): @@ -95,7 +95,7 @@ def log_object_data(data, file_name=None, format="yaml"):
95 95
96 def load_initial_data_from(file_name): 96 def load_initial_data_from(file_name):
97 if not os.path.exists(file_name): 97 if not os.path.exists(file_name):
98 - file_name = os.path.join(os.path.dirname(__file__), 'data/{}'.format(file_name)) 98 + file_name = os.path.join(os.path.dirname(__file__), 'data', file_name)
99 with open(file_name) as file_obj: 99 with open(file_name) as file_obj:
100 if file_name.endswith(".json"): 100 if file_name.endswith(".json"):
101 return Munch.fromDict(load(file_obj)) 101 return Munch.fromDict(load(file_obj))
Please register or login to post a comment