From b659466ac62a1f0f58e43cfcc108e913a8aa3106 Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem@us.ibm.com>
Date: Wed, 23 Jul 2014 13:11:13 -0700
Subject: [PATCH] Fix and update query for bug 1295808

This change does two things:

1. Updates the existing query since it was hitting
   on way more things than just EOFError, it would
   basically hit on any paramiko ssh error in
   test_security_groups_basic_ops.

2. Adds a check for EOFError in the
   test_volume_boot_pattern test.

Change-Id: Idceaefa22d16a4be725ebae584e0d7ec65f6b6c2
Related-Bug: #1295808
---
 queries/1295808.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/queries/1295808.yaml b/queries/1295808.yaml
index b5e0b3dd..de61357b 100644
--- a/queries/1295808.yaml
+++ b/queries/1295808.yaml
@@ -1,4 +1,7 @@
 query: >
-  message:"File \"tempest/scenario/test_security_groups_basic_ops.py\"" AND
-  message:"_verify_mac_addr" AND
-  tags:"console"
+  (message:"File \"tempest/scenario/test_security_groups_basic_ops.py\"" AND
+   message:"_verify_mac_addr") OR
+  (message:"File \"tempest/scenario/test_volume_boot_pattern.py\"" AND
+   message:"in _ssh_to_server") AND
+  message:"EOFError" AND
+  tags:"tempest.txt"