Commit 281a540c3c8cfe28c46adc56b6cf28e96763bd57

Authored by Igor Kulikov
1 parent 05404d87

TB-43: Disable check updates in test mode. Fixed windows install/uninstall package scripts

... ... @@ -73,7 +73,7 @@ IF "%JRE_PATH2%" == "" GOTO JAVA_NOT_INSTALLED
73 73
74 74 @ECHO Java 1.8 found!
75 75 @ECHO Installing ${pkg.name} ...
76   -${pkg.name}.exe install
  76 +%~dp0${pkg.name}.exe install
77 77
78 78 @ECHO DONE.
79 79
... ...
... ... @@ -4,6 +4,6 @@
4 4 net stop ${pkg.name}
5 5
6 6 @ECHO Uninstalling ${pkg.name} ...
7   -${pkg.name}.exe uninstall
  7 +%~dp0${pkg.name}.exe uninstall
8 8
9 9 @ECHO DONE.
\ No newline at end of file
... ...
... ... @@ -89,7 +89,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppC
89 89 @ActiveProfiles("test")
90 90 @RunWith(SpringJUnit4ClassRunner.class)
91 91 @ContextConfiguration(classes=AbstractControllerTest.class, loader=SpringApplicationContextLoader.class)
92   -@TestPropertySource("classpath:cassandra-test.properties")
  92 +@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"})
93 93 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
94 94 @Configuration
95 95 @EnableAutoConfiguration
... ...
... ... @@ -43,7 +43,7 @@ import static org.junit.Assert.assertNotNull;
43 43 @ActiveProfiles("default")
44 44 @RunWith(SpringJUnit4ClassRunner.class)
45 45 @ContextConfiguration(classes= MqttTelemetryIntergrationTest.class, loader=SpringApplicationContextLoader.class)
46   -@TestPropertySource("classpath:cassandra-test.properties")
  46 +@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"})
47 47 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
48 48 @Configuration
49 49 @EnableAutoConfiguration
... ...
  1 +updates.enabled=false
\ No newline at end of file
... ...