diff --git a/src/swarm-engine/Swarm/Game/Step/Const.hs b/src/swarm-engine/Swarm/Game/Step/Const.hs index 162ec92900..2874817e10 100644 --- a/src/swarm-engine/Swarm/Game/Step/Const.hs +++ b/src/swarm-engine/Swarm/Game/Step/Const.hs @@ -1485,7 +1485,7 @@ execConst runChildProg c vs s k = do checkRequirements parentInventory childInventory childDevices cmd subject fixI = do currentContext <- use $ robotContext . defReqs em <- use $ landscape . terrainAndEntities . entityMap - creative <- use creativeMode + privileged <- isPrivilegedBot let -- Note that _capCtx must be empty: at least at the -- moment, definitions are only allowed at the top level, -- so there can't be any inside the argument to build. @@ -1542,7 +1542,7 @@ execConst runChildProg c vs s k = do -- already has. missingChildInv = reqInv `E.difference` childInventory - if creative + if privileged then return ( -- In creative mode, just equip ALL the devices diff --git a/test/integration/Main.hs b/test/integration/Main.hs index 17cea6f436..c9c889c00b 100644 --- a/test/integration/Main.hs +++ b/test/integration/Main.hs @@ -84,7 +84,6 @@ import Swarm.Util.Yaml (decodeFileEitherE) import System.FilePath.Posix (splitDirectories) import System.Timeout (timeout) import Test.Tasty (TestTree, defaultMain, testGroup) -import Test.Tasty.ExpectedFailure (expectFailBecause) import Test.Tasty.HUnit (Assertion, assertBool, assertEqual, assertFailure, testCase) import Witch (into) @@ -309,7 +308,7 @@ testScenarioSolutions rs ui = , testSolution Default "Testing/201-require/201-require-entities-def" , testSolution Default "Testing/201-require/533-reprogram-simple" , testSolution Default "Testing/201-require/533-reprogram" - , expectFailBecause "Fix #1664" $ testSolution Default "Testing/201-require/1664-require-system-robot-children" + , testSolution Default "Testing/201-require/1664-require-system-robot-children" ] , testSolution Default "Testing/479-atomic-race" , testSolution (Sec 5) "Testing/479-atomic"