Fix conditions

tarantool · Sep 5, 2023 · afc702f · afc702f
1 parent bf913e9
commit afc702f
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/luatest/server.lua b/luatest/server.lua
@@ -147,11 +147,12 @@ function Server:initialize()
         self.http_client = http_client.new()
     end
 
-    if self.net_box_uri == nil and self.net_box_port == nil then
-        self.net_box_uri = self.build_listen_uri(self.alias, self.rs_id or self.id)
-    end
-    if self.net_box_uri == nil and self.net_box_port then
-        self.net_box_uri = 'localhost:' .. self.net_box_port
+    if self.net_box_uri == nil then
+        if self.net_box_port == nil then
+            self.net_box_uri = self.build_listen_uri(self.alias, self.rs_id or self.id)
+        else
+            self.net_box_uri = 'localhost:' .. self.net_box_port
+        end
     end
 
     self.env = utils.merge(self.env or {}, self:build_env())
@@ -191,8 +192,10 @@ function Server:initialize()
         self.tests = {}
     end
 
-    local prefix = fio.pathjoin(Server.vardir, 'artifacts', self.rs_id or '')
-    self.artifacts = fio.pathjoin(prefix, self.id)
+    if not self.artifacts then
+        local prefix = fio.pathjoin(Server.vardir, 'artifacts', self.rs_id or '')
+        self.artifacts = fio.pathjoin(prefix, self.id)
+    end
 end
 
 -- Create a table with env variables based on the constructor params.