Merge branch 'master' into debugLogger

Author: mjmac

README.md

@@ -70,7 +70,7 @@ Check out the **[contributing wiki](https://github.com/pions/webrtc/wiki/Contrib
 * [Jake B](https://github.com/silbinarywolf) - *Fix Windows installation instructions*
 * [Michael MacDonald](https://github.com/mjmac)
 * [Oleg Kovalov](https://github.com/cristaloleg) *Use wildcards instead of hardcoding travis-ci config*
-* [Woodrow Douglass](https://github.com/wdouglass) *RTCP, RTP improvements*
+* [Woodrow Douglass](https://github.com/wdouglass) *RTCP, RTP improvements, G.722 support, Bugfixes*
 * [Tobias Fridén](https://github.com/tobiasfriden) *SRTP authentication verification*
 
 ### License

pkg/ice/agent.go

@@ -640,11 +640,18 @@ func (a *Agent) getBestPair() (*candidatePair, error) {
 			res <- p
 			return
 		}
+		res <- nil
 	})
 
 	if err != nil {
 		return nil, err
 	}
 
-	return <-res, nil
+	out := <-res
+
+	if out == nil {
+		return nil, errors.New("No Valid Candidate Pairs Available")
+	}
+
+	return out, nil
 }

pkg/ice/agent_test.go

@@ -2,22 +2,40 @@ package ice
 
 import (
 	"testing"
+	"time"
+
+	"github.com/pions/transport/test"
 )
 
-func TestTimeConsuming(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
+func TestPairSearch(t *testing.T) {
+	// Limit runtime in case of deadlocks
+	lim := test.TimeOut(time.Second * 10)
+	defer lim.Stop()
+
+	var config AgentConfig
+	a, err := NewAgent(&config)
+
+	if err != nil {
+		t.Fatalf("Error constructing ice.Agent")
 	}
-}
 
-// func ExampleNew() {
-// m := New("a", "a", "b")
-// var list []string
-// for elem := range m.Iter() {
-// 	list = append(list, elem.(string))
-// }
-// sort.Strings(list)
-// fmt.Println(list)
-// Output:
-// [a a b]
-// }
+	if len(a.validPairs) != 0 {
+		t.Fatalf("TestPairSearch is only a valid test if a.validPairs is empty on construction")
+	}
+
+	cp, err := a.getBestPair()
+
+	if cp != nil {
+		t.Fatalf("No Candidate pairs should exist")
+	}
+
+	if err == nil {
+		t.Fatalf("An error should have been reported (with no available candidate pairs)")
+	}
+
+	err = a.Close()
+
+	if err != nil {
+		t.Fatalf("Close agent emits error %v", err)
+	}
+}