From: wang biao <biao716.wang@samsung.com>
Date: Tue, 18 Jun 2024 08:51:20 +0000 (+0800)
Subject: fix conflict with master branch
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=df0e3203d92e648250eaa59f63dc7430755f4b28;p=tools%2Fgbs.git

fix conflict with master branch

Change-Id: I57cb6adf80b8a840c0cde3fc0278690daa4771b4
Signed-off-by: wang biao <biao716.wang@samsung.com>
---

df0e3203d92e648250eaa59f63dc7430755f4b28
diff --cc tests/test_passwdx.py
index 2d31baf,59d5a86..56c0d86
--- a/tests/test_passwdx.py
+++ b/tests/test_passwdx.py
@@@ -152,8 -158,8 +158,8 @@@ class AutoGenerateTest(unittest.TestCas
      'test auto generation if no conf was found'
  
      @Fixture()
 -    def test_auto_generate_conf(self, fake_open, _fake_chmod):
 +    def test_auto_generate_conf_pos1(self, fake_open, _fake_chmod):
-         'test auto generate conf should contain obs and repos'
+         'test auto generate conf should contain repos'
          conf = FakeFile()
          fake_open.return_value = conf