removed properties file and changes in test case

pytorch · May 8, 2020 · 1c09831 · 1c09831
1 parent ecfd86c
commit 1c09831
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 25 deletions.
diff --git a/frontend/server/src/test/java/org/pytorch/serve/ModelServerTest.java b/frontend/server/src/test/java/org/pytorch/serve/ModelServerTest.java
@@ -1250,17 +1250,12 @@ private void testMetricManager() throws JsonParseException, InterruptedException
     }
 
     private void testTSValidPort()
-            throws InterruptedException, GeneralSecurityException, InvalidSnapshotException,
+            throws InterruptedException, InvalidSnapshotException, GeneralSecurityException,
                     IOException {
         //  test case for verifying port range refer https://github.com/pytorch/serve/issues/291
         server.stop();
-        System.setProperty("tsConfigFile", "src/test/resources/config_port.properties");
         FileUtils.deleteQuietly(new File(System.getProperty("LOG_LOCATION"), "config"));
-        ConfigManager.init(new ConfigManager.Arguments());
-        configManager = ConfigManager.getInstance();
-        PluginsManager.getInstance().initialize();
-
-        InternalLoggerFactory.setDefaultFactory(Slf4JLoggerFactory.INSTANCE);
+        configManager.setProperty("inference_address", "https://127.0.0.1:42523");
         server = new ModelServer(configManager);
         server.start();
 
@@ -1288,19 +1283,12 @@ private void testTSValidPort()
         testPing(channel);
     }
 
-    private void testTSInvalidPort()
-            throws InterruptedException, GeneralSecurityException, InvalidSnapshotException,
-                    IOException {
+    private void testTSInvalidPort() {
         //  test case for verifying port range refer https://github.com/pytorch/serve/issues/291
         //  invalid port test
         server.stop();
-        System.setProperty("tsConfigFile", "src/test/resources/config_invalid_port.properties");
         FileUtils.deleteQuietly(new File(System.getProperty("LOG_LOCATION"), "config"));
-        ConfigManager.init(new ConfigManager.Arguments());
-        configManager = ConfigManager.getInstance();
-        PluginsManager.getInstance().initialize();
-
-        InternalLoggerFactory.setDefaultFactory(Slf4JLoggerFactory.INSTANCE);
+        configManager.setProperty("inference_address", "https://127.0.0.1:65536");
         server = new ModelServer(configManager);
         try {
             server.start();

diff --git a/frontend/server/src/test/resources/config_invalid_port.properties b/frontend/server/src/test/resources/config_invalid_port.properties
diff --git a/frontend/server/src/test/resources/config_port.properties b/frontend/server/src/test/resources/config_port.properties