Project

General

Profile

Revision f370cc85

Added by Thomas McKay almost 6 years ago

fixes #16501 - subnets import not setting proxies

Changed the vcr recording by adding --reload-cache to all the hammer commands. This hopefully will avoid the intermittent failures due to fetching the v2.json.

View differences:

test/resources/activation_keys_test.rb
8 8
      set_user 'admin'
9 9

  
10 10
      stdout,stderr = capture {
11
        hammer.run(%W{csv activation-keys --help})
11
        hammer.run(%W{--reload-cache csv activation-keys --help})
12 12
      }
13 13
      assert_equal '', stderr
14 14
      assert_equal stdout, <<-HELP
......
41 41
      file.rewind
42 42

  
43 43
      stdout,stderr = capture {
44
        hammer.run(%W{csv activation-keys --verbose --file #{file.path}})
44
        hammer.run(%W{--reload-cache csv activation-keys --verbose --file #{file.path}})
45 45
      }
46 46
      assert_equal '', stderr
47 47
      assert_equal stdout[0..-2], "Creating activation key '#{@name}'...done"
......
49 49
      file.rewind
50 50

  
51 51
      stdout,stderr = capture {
52
        hammer.run(%W{csv activation-keys --verbose --file #{file.path}})
52
        hammer.run(%W{--reload-cache csv activation-keys --verbose --file #{file.path}})
53 53
      }
54 54
      assert_equal '', stderr
55 55
      assert_equal stdout[0..-2], "Updating activation key '#{@name}'...done"
56 56
      file.unlink
57 57

  
58 58
      stdout,stderr = capture {
59
        hammer.run(%W(activation-key list --organization Test\ Corporation --search name=#{@name}))
59
        hammer.run(%W(--reload-cache activation-key list --organization Test\ Corporation --search name=#{@name}))
60 60
      }
61 61
      assert_equal '', stderr
62 62
      assert_equal stdout.split("\n").length, 5
63 63

  
64 64
      id = stdout.split("\n")[3].split(" ")[0]
65 65
      stdout,stderr = capture {
66
        hammer.run(%W(activation-key delete --id #{id}))
66
        hammer.run(%W(--reload-cache activation-key delete --id #{id}))
67 67
      }
68 68

  
69 69
      stop_vcr

Also available in: Unified diff