Removed pytest related files and added those to PR sonic-net#1125

Signed-off-by: Akhilesh Samineni <akhilesh.samineni@broadcom.com>
AkhileshSamineni · Nov 13, 2019 · 7a0ccd1 · 7a0ccd1
1 parent d7113d6
commit 7a0ccd1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 366 deletions.
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -17,8 +17,8 @@ endif
 CFLAGS_GTEST =
 LDADD_GTEST = -L/usr/src/gtest
 
-tests_SOURCES = swssnet_ut.cpp request_parser_ut.cpp ../orchagent/request_parser.cpp            \
-        quoted_ut.cpp ../orchagent/natorch.cpp
+tests_SOURCES = swssnet_ut.cpp request_parser_ut.cpp ../orchagent/request_parser.cpp
+        quoted_ut.cpp
 
 tests_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI)
 tests_CPPFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON) $(CFLAGS_GTEST) $(CFLAGS_SAI) -I../orchagent

diff --git a/tests/conftest.py b/tests/conftest.py
@@ -157,8 +157,7 @@ def __init__(self, name=None, imgname=None, keeptb=False, fakeplatform=None):
         self.syncd = ['syncd']
         self.rtd   = ['fpmsyncd', 'zebra']
         self.teamd = ['teamsyncd', 'teammgrd']
-        self.natd = ['natsyncd', 'natmgrd']
-        self.alld  = self.basicd + self.swssd + self.syncd + self.rtd + self.teamd + self.natd
+        self.alld  = self.basicd + self.swssd + self.syncd + self.rtd + self.teamd
         self.client = docker.from_env()
 
         if subprocess.check_call(["/sbin/modprobe", "team"]) != 0:

diff --git a/tests/test_nat.py b/tests/test_nat.py