← Back to branch summary

~dave-cheney/goose/003-fix-fd-leak

« back to all changes in this revision

Viewing changes to testservices/novaservice/service_http.go

  • Committer: Tarmac
  • Author(s): Martin Packman
  • Date: 2013-02-08 17:18:16 UTC
  • mfrom: (67.1.1 never_decrement_next_id)
  • Revision ID: tarmac-20130208171816-zl7yb4m6j1wlewsu
[r=gz] Never decrement next id in nova testservce

Adjusting the next id downwards is not necessary and can cause breakage
across testcases when cleanup does not exactly match creation, which is
common in juju.

Show diffs side-by-side

added added

removed removed

Lines of Context:
testservices/novaservice/service_http.go
866
866
                        if err := n.removeSecurityGroup(group.Id); err != nil {
867
867
                                return err
868
868
                        }
869
 
                        if n.nextGroupId > 0 {
870
 
                                n.nextGroupId--
871
 
                        }
872
869
                        writeResponse(w, http.StatusAccepted, nil)
873
870
                        return nil
874
871
                } else if err == errNoGroupId {
933
930
                        if err = n.removeSecurityGroupRule(id); err != nil {
934
931
                                return err
935
932
                        }
936
 
                        if n.nextRuleId > 0 {
937
 
                                n.nextRuleId--
938
 
                        }
939
933
                        writeResponse(w, http.StatusAccepted, nil)
940
934
                        return nil
941
935
                }
995
989
                if ipId := path.Base(r.URL.Path); ipId != "os-floating-ips" {
996
990
                        if nId, err := strconv.Atoi(ipId); err == nil {
997
991
                                if err := n.removeFloatingIP(nId); err == nil {
998
 
                                        if n.nextIPId > 0 {
999
 
                                                n.nextIPId--
1000
 
                                        }
1001
992
                                        writeResponse(w, http.StatusAccepted, nil)
1002
993
                                        return nil
1003
994
                                }