Revision b780c231

b/qa/qa_node.py
113 113
def TestNodeStorage():
114 114
  """gnt-node storage"""
115 115
  master = qa_config.GetMasterNode()
116
  enabled_disk_templates = qa_config.GetEnabledDiskTemplates()
116 117

  
117 118
  # FIXME: test all storage_types in constants.VALID_STORAGE_TYPES
118 119
  # as soon as they are implemented.
......
124 125
    # Skip file storage if not enabled, otherwise QA will fail; we
125 126
    # just test for basic failure, but otherwise skip the rest of the
126 127
    # tests
127
    if storage_type == constants.ST_FILE and not constants.ENABLE_FILE_STORAGE:
128
    if storage_type == constants.ST_FILE and not \
129
        ((constants.DT_FILE in enabled_disk_templates) or
130
         (constants.DT_SHARED_FILE in enabled_disk_templates)):
128 131
      AssertCommand(cmd, fail=True)
129 132
      continue
130 133

  

Also available in: Unified diff