From: Peter Amstutz <peter.amstutz@curii.com>
Date: Fri, 4 Sep 2020 19:19:36 +0000 (-0400)
Subject: Fix test failure, refs #16689
X-Git-Tag: 2.1.0~79
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/1771152da97200b038378666457d18679f4c8cd7

Fix test failure, refs #16689

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/services/login-sync/test/test_add_user.rb b/services/login-sync/test/test_add_user.rb
index e90c16d64f..db909ac83f 100644
--- a/services/login-sync/test/test_add_user.rb
+++ b/services/login-sync/test/test_add_user.rb
@@ -16,20 +16,15 @@ class TestAddUser < Minitest::Test
     File.open(@tmpdir+'/succeed', 'w') do |f| end
     invoke_sync binstubs: ['new_user']
     spied = File.read(@tmpdir+'/spy')
-    assert_match %r{useradd -m -c active -s /bin/bash -G (fuse)? active}, spied
-    assert_match %r{useradd -m -c adminroot -s /bin/bash -G #{valid_groups.join(',')} adminroot}, spied
+    assert_match %r{useradd -m -c active -s /bin/bash active}, spied
+    assert_match %r{useradd -m -c adminroot -s /bin/bash adminroot}, spied
   end
 
   def test_useradd_success
     # binstub_new_user/useradd will succeed.
     File.open(@tmpdir+'/succeed', 'w') do |f|
-      f.puts 'useradd -m -c active -s /bin/bash -G fuse active'
-      f.puts 'useradd -m -c active -s /bin/bash -G  active'
-      # Accept either form; see note about groups in test_useradd_error.
-      f.puts 'useradd -m -c adminroot -s /bin/bash -G docker,fuse adminroot'
-      f.puts 'useradd -m -c adminroot -s /bin/bash -G docker,admin,fuse adminroot'
-      f.puts 'useradd -m -c adminroot -s /bin/bash -G docker adminroot'
-      f.puts 'useradd -m -c adminroot -s /bin/bash -G docker,admin adminroot'
+      f.puts 'useradd -m -c active -s /bin/bash -G active'
+      f.puts 'useradd -m -c adminroot -s /bin/bash adminroot'
     end
     $stderr.puts "*** Expect crash after getpwnam() fails:"
     invoke_sync binstubs: ['new_user']