Merge pull request #69 from thingsboard/feature/TB-43
TB-43: Disable check updates in test mode.
This commit is contained in:
commit
9668b8a231
@ -73,7 +73,7 @@ IF "%JRE_PATH2%" == "" GOTO JAVA_NOT_INSTALLED
|
||||
|
||||
@ECHO Java 1.8 found!
|
||||
@ECHO Installing ${pkg.name} ...
|
||||
${pkg.name}.exe install
|
||||
%~dp0${pkg.name}.exe install
|
||||
|
||||
@ECHO DONE.
|
||||
|
||||
|
||||
@ -4,6 +4,6 @@
|
||||
net stop ${pkg.name}
|
||||
|
||||
@ECHO Uninstalling ${pkg.name} ...
|
||||
${pkg.name}.exe uninstall
|
||||
%~dp0${pkg.name}.exe uninstall
|
||||
|
||||
@ECHO DONE.
|
||||
@ -89,7 +89,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppC
|
||||
@ActiveProfiles("test")
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
@ContextConfiguration(classes=AbstractControllerTest.class, loader=SpringApplicationContextLoader.class)
|
||||
@TestPropertySource("classpath:cassandra-test.properties")
|
||||
@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"})
|
||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||
@Configuration
|
||||
@EnableAutoConfiguration
|
||||
|
||||
@ -43,7 +43,7 @@ import static org.junit.Assert.assertNotNull;
|
||||
@ActiveProfiles("default")
|
||||
@RunWith(SpringJUnit4ClassRunner.class)
|
||||
@ContextConfiguration(classes= MqttTelemetryIntergrationTest.class, loader=SpringApplicationContextLoader.class)
|
||||
@TestPropertySource("classpath:cassandra-test.properties")
|
||||
@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:thingsboard-test.properties"})
|
||||
@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
|
||||
@Configuration
|
||||
@EnableAutoConfiguration
|
||||
|
||||
@ -0,0 +1 @@
|
||||
updates.enabled=false
|
||||
Loading…
x
Reference in New Issue
Block a user